Revert to Enumerator bodies. Simpler, but I'm still queasy about this.
Reinstate servlet example.