Get rid of some unnecessary scalars