attempt to improve FS/VFS scalar-valued vs vector-valued mess