Reduce redundant code

Comment From: snicoll

Thanks but that kind of optimizations is unnecessary, in particular in such advanced code base. We prefer code branches to be explicit