Moved most values out of Constants.h and into more constrained scopes.