Removed direct use of models.common from docs. Fixed some item model methods broken by the new with-collection macro.