Fix build on aarch64-darwin

I found that these two changes were necessary in order to build on an Apple Silicon machine with a recent Clang. Details in the corresponding commit messages. I _think_ they would not affect other targeted platforms, but I'm happy to adjust if necessary.