Only created de-sugared nodes where necessary.
Capitalize macros for consistency.