Changes to BaseScalar

BaseScalar was checking against Vectors, but Vectors have op-priority and thus
should be doing this.