Clean up patches for latest exc.