ported improved table quoting from 1.4