More work on the new markup loader.
Improve the markup loader further by no longer redundantly copying file data.
Cleanup.