Fix the VWF's interaction with substrings.