Instead, just add functions to add the instances directly, avoiding the
intermediate allocation and deindenting a bunch of the code.

This should have no behavior change.