Checkpoint neat code
Two SQL canonicalization fixes:  int/float and quoted choices in forms, cleaner in subroutines