More prepping for boQL v2.