Add constexpr and make editorial changes after Urbana LEWG meeting