A slight enhancement to #650, plus fixing CocoModels thinking they're modified when schema defaults have been added.