Be a bit more thrifty with unsafe {}
Merge pull request #162 from nwin/master

Be a bit more thrifty with unsafe {}