[DEBUG] Minor clean-up and enhancements.