Fix bug with embedded predicates.