I've got some new code working with way fewer SLoC than the equivalent from the previous version and now I'm tempted to golf it down a little more.