Project Tidy up and tie up lose ends for query extension types. Close #1. Close #2.