Some extraneous semicolons were included in a recent patch which causes a build failure with newer compilers. (cherry picked from commit af8ea0f4) (cherry picked from commit a33d347c)