tweaks to get vs2013 to compile (remove constexpr)