Revised boolean_lexing patch for current master

Simpler fix based on your previously-pulled patches.