Updated the bundler refactoring TODOs we agreed on yesterday in light of
all the changes that have since been made. Will seek confirmation that
these all make sense with @andyberry88 first thing tomorrow.