Issue #489

Use self inside of each iterator functions.