Some refactoring as preparation to add field names to references from
referring to referred object.