Other fixup to d74c197.