I a letter
Return instance in _generateQuery

Simpler than doing it in each method

Still a bit of juggling in alias() because we have to update the person attribute *after* the query is run
Log all queries, not just the last one
Add query logging tests