Lots of changes in the middle of performance tuning.
Addendum to previous commit.

Why does the GitHub UI miss files the first time around?