Made above-the-line detection a lot more sane