Remove superfluous semicolons

Backport of: 7ec7ffe84ef4245b0f7879f2076727c2c5b18b48
Ref: #8476