SDL: More cleanups. (nw)