This isn't quite right. Up above we use `_.defaults` (as opposed to `_.assign`). The thinking behind that was that if we end up reloading something, and it has changed remotely in the meantime, we'll keep the old version because that's what any pending changes were based on. I'm not 100% sure that's the right approach, but anyway, it means that we should only `_updateCalculated` for entities that `_.defaults` actually added. You probably just want to merge what `_.defaults` does into the for-in loop.