Fix trac #2680; avoid quadratic behaviour from (++)