Knock out a couple TODOs in msg.c
Add stupidness required by 4.3 BSD's lame cpp...