msg.c cleanup

trivial cleanup commits. Guess one ACK is enough?