Cosmetic.
Bugfix.
Cleanup, and finally handle RGB sources properly.