Cleanups relating to #64. The issue was a non-issue as I had randomly guessed the correct constant which was used as a place holder...