Further cleanup of comment strings.