Changed generator so that scalar operands are no longer passed by pointer