Changed handling of predefined macros in cc65 allows for simplification.