Merge "Remove bogus semicolons"