Attempting to fix GH#10, which should mean a fix for Clang 5.0 on OS X 10.9