(MESS) Some more cleanups for 990_x. (nw)