brew style
Fixes for https://github.com/Homebrew/brew/pull/12152. Extracted into a separate PR so this can be merged immediately.