@theopolis @thor there are some comments on my PR related to using if-expressions. Are we moving to C++17 anytime soon?