Remove `self` references in favor of #bind