Remove the lastMatchIdx etc. Fixes 48