d1d45012e0
(as far as we can so far, at least) Note that quota won't actually work fully with multiple object types as it is, but this and the last change are a good start and do fold together a lot of duplicated code.