Revert "Kill off last_idx ugliness"
Revert "Kill off last_idx ugliness"

This reverts commit 629f221f29c638abcf8458173c340e22c64ccfcc.

yrro/command-t,wincent/command-t,yrro/command-t,wincent/command-t,wincent/command-t,mtimkovich/command-t,mtimkovich/command-t