Tweaks to EnumerableWrapper