Replace enforceEx with enforce where it's possible
Merge pull request #2462 from Geod24/kill-enforceex

[Trivial] Replace usage of enforceEx with enforce