Address remaining suggestions from review of #8 (invalidation)
Address remaining suggestions from review of #8 (invalidation)