Fixed ANTLR build tool to match rearranged source.