Enforce more constness