assorted cleanups by SethTisue · Pull Request #5383 · scala/scala
that I've been hoarding til the dust settled
github.com