Since we moved all of the error messages, we might as well now move all of the other messages for consistency.