MNT: Refactor constants (comments welcome)

closes #209 
This would be a great place for a log entry.  Probably at the warning level.