Two more cleanups.