More generic VxL to VL changes.