normalize start/commit/rollback query generation