No big changes, in the middle of fixing Iterator behavior.