Change internal variable name doneex->notdoneex
Introduce itr macro, unexport the other iterator macros