Committing just for safety and historic purposes. Still have to run the query extractor on files after form-procs.tcl (I make too many typos when generating the .xql by hand) and need to fix the db_map's (which I appropriately flagged so I can remember).