Update to reflect ANTLR usage.
Clean up stale code.
Clean up unnecessary casts.