Cleaned up some constraints.