`r` should be by-name to match prior strictness.