XIterable and Java7 updates.