This seems to add a little complexity, but it avoids the need to completely refactor make_message() right now.
LGTM
Committed as https://code.google.com/p/rietveld/source/detail?r=986c0094ed347be932adbbca96...