Re-work query to make a little more sense. No functional difference.
Add accessors for further-afield relations.