Refactoring models to be partially more specific (types) and partially non-dialect specific.