MNT: Refactor constants (comments welcome)

closes #209 
The `Z == 1000` check and all of the '#X' checking.  I can take care of this if you want.