Fix up previous del/ins autocomplete mess