Fix broken shape promotion for * and /