Heavily nested parentheses and lots of indentation can get hard to read, so we should simplify this where we can. Issue: gh-6639
Heavily nested parentheses and lots of indentation can get hard to read, so we should simplify this where we can. Issue: gh-6639