Cleaned up iterator increments and decrements