Fixes a Mac build error introduced by 3bc33154. Fixes a Mac test build error that shows up on newer toolchains.
Issue: #975