Move a bunch of stuff into "holder" instances.