jfk: improve << >> removal with highlighting