Autosquash and grep line numbers

Not sure why this wasn't committed before...