Remove some duplication across BuilderBases