I think the only difference between the two branches above is one directory in the search path. Merge them, perhaps?