Shall we change them?  Otherwise at least we should change the comment wording  ;)