IT renames for clarity.
Get rid of unnecessary loaders now that mocking is no longer necessary.
Cache external constraints so they aren't re-calculated every time.