Making the file method resolve fonts with the database
Adding a little TODO for file lookup
As a matter of fact, there was nothing to optimize...
Making make check work on my system

I cannot actually understand what was all the ENV thing for...