Fix names Uncomment to TrimComment, WriteUncommentedTo to
WriteCommentTrimmedTo.