Changed based upon suggestions at https://github.com/sharwell/antlr4cs/pull/34