Interim update of implementation for Mac OS.