Minor refactoring, removes optional trailing ";" in the parser