Incorporate switch suggestion from Robert Ramey for OSX builds