flush PBuildClass before applying build macros
minor adjustments to unify_of