- Improved on_source behavior.