The split between XFMemLoader.cpp and XFMemory.cpp should probably be resolved at some point; I have an idea for doing that, but that would be a separate patch.  I'm trying to post stuff in reviewable chunks.