Change rethrow statements

[Gerardwx]

In C++, exceptions are rethrown with just throw, otherwise they get sliced into the type of the catch expression as discussion at https://en.cppreference.com/w/cpp/language/throw