minor clean-up

The casts are to get around -Wint-to-pointer-cast
Merge branch 'master' of https://github.com/sebcat/unixlove