Work on some of those JavaCC conflicts