2014-05-07-Make OpenBSD mostly happy with some misc code cleanup [gettler]