fixup straggler eager singletons