Yes.  Frankly, the old way with duplicated code was much clearer.  However, there IS a way to remove some of the duplication without the mess.... I'm sure of it...