Eliminate left-over 'self' arguments.