Some mess.mak file cleanups/consolidations  (nw)