Small fixups
WIP
Group predicates
WIP