Tidy up loading to use the pipeline pattern more consistently.

Pipeline construction is still a little messy, probably needs a little more work still.