r19398: more comments