Update to ANTLR 3.5.2, 4.2.1, and ST 4.0.8
Remove workaround for a bug that has since been fixed
Update module versions for release 2.2.1