Misc legacy handlers cleanups. (nw)