Associations now have a type. Rewrite of verb-preposition mappings to use associations.