lint: Fix gofumpt's new offenses

Gofumpt linter introduced a new rule (https://github.com/mvdan/gofumpt/releases/tag/v0.9.0). This rule prohibits "clothe" naked returns for the sake of clarity. Although naming results in function signatures is supported, it's confusing lone return statements.