Avoid hack for this/that/self stuff