Clean up of `name` fallback code.

Don't use `unless` for the conditional.
Avoid double-quotes where possible.