Work around bugs in VS2013. All tests pass.