Correct sentinel.
Invalidate sort order as needed.
Fix compiler thunk checking.