Better HABTM resolve, reverse cleanup, next step is speed, 0.4.2