Two branches were actually doing essentially the same thing here, no need to artificially complicate things. ;)