Make stream messages a bit more regular in form