Add arithmetic and conversion according to n3740.