Clean up the space diffing code

[adehnert]

The code for telling CAC what the updated office access should be is pretty terrible. I suspect that this could be refactored a bunch, but I don't actually know. Certainly I knew at the time that it was terrible, and couldn't think of a better way. Maybe a second set of eyes (either a different time or a different person) would help.