Replace PromotionTraits hack by decltype + trailing return types

This makes the code more robust and (a bit) more robust.  Additionally,
it repairs the recent breakage that I introduced by modifying promotiontraits.hh.