@mdmkolbe can you review this file for stuff relating to JavaCC conventions? It's been a while and I don't trust my ability to tell if something is weird.