Instead of changing the size, how about add two more varchar long length columns to also cover the original code path for VARCHAR by bytes?