Redundant if and c++98 compatibility fixed.