PR #7: Add end-of-line comments and comments within declarations