Totally agree from experience that if/else flagging is vastly better than separate branches - you will get burned _hard_ if you take the wrong approach!