- Changed implementation of add/sub/mul primitives to be more efficient