Phew.  This helper has been changed to figure out which of the three pagination modes you're using.  Probably needs a catch-all though.  I'll add that now.