Whitespace, comment, and scope changes