further ideas/fixes

I'm creating a pull request (rather than further commenting Homebrew#28350) because it seemed like it would be easier for you to use a PR.

No need to credit me if you do use anything; feel free to rebase my commit out of existence.