Cleanup
Minor handler internal refactoring
Create consumer arrays just-in-time