Quote keys in optional SQL clauses (Issue #408)