It looks like the only change here is making the comment a single line - doesn't this now violate the short comments (probably 80 chars break) or less thing?