Some final cleaning up of format. Also remove dtg error from IDQueryTest.