Add offset for next element when updating current_position

* niftier approach that I'm much happier with!
* also introduced constant to represent that concept - no more
  magic +1s :)
Update reference to now somewhat updated constant