Merge "Clean up quick rejection, especially surrounding points + lines."