Refactored Iterable operators. Gradle fixes