Finish migration of relevant things to QueryRunner so it compiles