Drop raw select.
Add :where test.
Use a macro to greatly simplify expanders.