Improved javacc