Switched to using constants