Rename the parameter 'xp' in several methods to 'self', since that's

what it is.