You're right. Let's propagate the changes there as well. I'd rather see those types be explicit in the way they prettify messages.