More self, less binding

Pretty straight forward. Noticed this when I was working on the scripted fields.