Minor stylistic changes to `key()` rename