Knock on wood, editing of Model Types seems to work

Introduced rebuildBundle into the main code.

Had to make the main chain more container-aware, but that's not
surprising.