Improved comments from lexical spec