Also, sort of a twin-PR to #1367, which has the loader define itself in its modules. This is more for organization, and really there's no reason outside of actual loading functionality that we should be using loader as a dependency when we can avoid it