Juliusz Chroboczek authored Jan 21, 2018 and Juliusz Chroboczek committed Oct 23, 2018

This removes duplication between unicast and multicast variants of message
formatting.