The code is getting better.

Removing all the pain of 2 years ago is taking some time, but this
code is approaching a stable maintainability that I can appreciate.