* It's quite hard to write "Related" these days :-)
* Made the generic part really generic this time, less magical calls/assumptions.