Now compiles under clang 4.1 on Mac