Minor HandlerMap fixes.
- Corrected comment
- Eliminated redundant, broken code