Some more cleanup and another possible bench performance improvement.