Fixing compile so that on OSX we always use clang. Also updated save/restore m4 tests.