Fix OS X build error. Continuing to plow forward post-megamerge....