Extract Unicode numbers to constants

Did a small refactoring.  Thoughts/feedback?

Also, I don't think you want those failing :poop: s passed, right?