Use constexpr again, this time portably

Responding to Justin's review of r205025.