minor template tweaks to recent Iterable<T> changes