slight rewrite of helper predicates
minor formatting
minor re-vamp of PartBuilder