Fix semicolon optionalization.

Please add Fixes #16 to the merge commit message.