Add handling of trivial primitives