Fix constant names and 'exe-only'

That'll teach me to commit before the specs finish.

Really [FixRM #8149]