One more lurking rewrite
Finished up atomicity cleanup, removed a bunch of old fixtures
Include association properties in serialized instances