Fix SWH contructors (Apple)

@tobydox, please advise as I cannot easily test the win32 impact of this
change.