address oversights in recent reorganization of language detection code

In particular the problem addressed by commit eb45b93ad52b6112ddf31be1480a5232d2c57603 prevented the detection of English language on Mac OS X.