esc: Clean up some more.