Taking a stab at this myself, split into several patches. Hopefully this helps us make some forward progress... At least a couple of the new message hints are overly long. Suggestions welcome as to how to shorten them.