Improved messages, per Brent's feedback.