Some code clean-up and simplification.
This version of the code sustained 126,080 messages per second,
for 100 million messages.