Correct annotations. #3936.