[refactor] handle more chars in vectored code