Let's keep the comments together with the lines they describe, this is easier to read and probably more maintainable in the long run. Also, () → {} for idiomaticity.
We previously had tooling for the opposite direction, let's complete the work.