Removing dependency on C++11's constexpr

This partially reverts 747526ee722e95
Merge branch 'master' of github.com:stp/stp