Cleanups and small performance improvements
Removed default callback function(s) and prefix compare
Minor cleanups, no functional changes