removed None2None in basicPrimitives (roughly 2x faster)