ENG-4653: Cleanup.  Unmagic some constants, add some commentary, etc.