Syntactic and comment changes.