Handle trailing comments properly