avoid binding in the abstract data source
use existing self alias for consistency
Merge pull request #2123 from w33ble/selfies

More self, less binding