Clean up equals() and unnecessary self local variables.