Oh, my bad. I didn't realize that the latest PR included the attempt at the regex. I don't have a strong feeling one way or the other about this circumstance of performance vs. nonhackery. If you'd rather take it out, I raise no objection... clearly, I decided not to implement this kind of optimization in buildClause() itself, for similar reasons. It's already really messy in here.