I believe this is the overlap that @dturanski was talking about with this PR and the reworking he is doing with message conversion in general.  We should probably sequence the merge so that this PR goes in first and then David's work on top of it.  Thoughts @dturanski ?