Fix some forgotten cleanups.