Improve scrutinizer rating

[mmucklo]

It would be good to do a little refactoring to improve our scrutinizer rating.

One concern of mine is if I modularize things too much that the performance of the code may suffer as a result due to things like function-call overhead in tight loops, nevertheless it's probably less than simple to maintain at this point.

Although there is plenty of complex code in things like say "gcc" or other tools that are the bread and butter of our industry, so it may make sense to let it be and focus more on test coverage...