Replaced existing explicit tracefiles with ones that use common statements
to (as much as possible) have all the queries that the router does in a common place
and make the future changes/extensions easier.

RB: 22428