Improved the handling of --msgs2stderr a little more.