Cherry-pick cda82f84 to master
Adds fixes introduced in !373 (merged) to master. While these changes are not necessary for newer versions of C++ used for Sim10/master they improve the readability of the code.
Edited by Dominik Muller
Adds fixes introduced in !373 (merged) to master. While these changes are not necessary for newer versions of C++ used for Sim10/master they improve the readability of the code.