Small fixes inspired by debugging eicrecon

[nathanwbrei]

Here's a fun rabbit hole: https://stackoverflow.com/questions/56083894/bug-throwing-exceptions-with-stdcall-once

Apparently std::call_once is not always exception-safe?!? Particularly the libstdc++ implementation