Fix a couple gcc7 compilation warnings

(from Scott Snyder)

gcc7 warns about fallthrough between switch cases. This warning can be suppressed with a special comment. Change the fallthrough comment here to the form that gcc7 recognizes.