Fixed a couple of scalarType parameterization bugs.