More cleanup of vaspio_set.