Initial refactoring of relationship translation out of fetch. Needs cleaning up.