Get some changes from Neon to make some of our awful hacks much cleaner.

Authored by tsimonq2 on Fri, Jul 20, 12:52 PM.