beginnings of --msg-* support