fix a bug with scalar handling by simplifiying the maybeScalar check.
3 files changed