Remove artifacts of old indexed Each

Fixes #337