Can you change this to `if (...) { return ...; }` blocks?