Don't make CI redo work.
Create an `expr` function.
Implement more forms of query functions.
Add c++ test files to Xcode project.