Moved to using multi_prop Template instead of properties and two_props

This doesn't quite work properly yet, it doesn't appear to handle cases
where one of the things in the relationship has two or more types.