BP: more BPFactorFactory simplification