Simplify match block removing code for multi-byte chars