Is this a new requirement?  I see lots of lines exceeding 80 characters in this file alone.