Major refactoring of content-loading logic.