JAL-2310 don't double-count sequence matches; code tidying