Tweaked Core files to reduce dependencies

CoreModule per se was being incorrectly depended on in a couple of
places, which resulted in a world-recompilation when you changed
internals of Core.