Use namespace keyword shorthands for msg namespace

This should fix  #116.

It looks fine, I think, the tests still run, but there's a slight chance that `sed` might have tricked me.