May need to check that return-thingy there with MSVC compilers, but worst-case we can just add it back in.