Some more message unifications.
2 files changed