Switched back to tree based search to allow other combinators without much hassle
Re-added other combinator types.