better auto-quoting