These changes turned out to be not strictly necessary after switching from Clang to GCC. I'm reverting them for the sake of clarity.