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