Improve handling of L1ID wrap up.