Add 'or' style 'and' parsing capability