Predicate encoding should be withing {}s. And general cleanup.