ANTLR and more/less enhancements.