Tidy up after fixing non-trivial elimination linear search