- Refactored to allow inspection of source / sender info by command.