A bit of cleanup on Linux and BSD build configurations