Hrrm... more rethinking on #151. It only applies to Linux, so make it specific rather than generic