Syntactic tidying of VectorMode