Introduce null object.
Remove obsolete javadoc.
Invert if for better readability
Introduce EOF token.
Reorganize imports.