Move some code out of unsafe blocks. #95

Merged

larsbergstrom merged 1 commit into master from unsafe

Aug 19, 2014