Remove uses of deprecated 'safe' option. RFixes #60