Ensure wrapped method is passed reference to self.

Also store Field instance in wrapped dict, rather than just field name.