After reconsideration, I suppose no TODO is needed here anymore as the types have to be the same, i.e. the message is OK.