Merge "Replace remaining enforceXXX methods"