86b1edb40c
remove if with polymorphism for different builders (easier to understand by naming)
remove if with polymorphism for different builders (easier to understand by naming)