@WIP Tidying up complex predicate rendering