* Better detection of binaries.