Let's get rid of that message inconsistency once and for all.