[PATCH 0/3] Make line searching more predictable