[Olena-patches] 2141: Follow g++ 4.3 advice w.r.t. nested `if' statements.