Slight reworking of __mul__ and __add__