WIP: Refactor constants (comments welcome)

These changes seem unrelated.