Misc cleanups. (nw)