Cleaning up some constant handling.