Clean up the Java AST: Avoid sub-classes in favor of Enum

Clean up the Java AST: Avoid sub-classes in favor of Enum #4521