Use unload! instead of clear.
Remove more tests of the old interface (which can be added back.
Refactor with_loading helper method to use new interface.