[#80334374] Improve conditional nesting.