WIP: Refactor constants (comments welcome)

yes, they are. these leaked in from other work, but are still reasonable changes