Not sure if the things I made optional on Darwin are really worth keeping at all, but I don't have a Linux box handy so I'm minimizing potential damage.