FreeQuery: minor cleanup