Some reformatting of SQL.

Slightly more elegant way of collecting results in
_type_by_external_id() and in _type_by_external_db_id().