Fix backtracking; support disjunctions