Much improved SQL grammar