Fixed build issues related to numerics reform and namespaced enums

Everything builds and all the tests pass.