Improved file collector.
Fixes lighp/lighp#13.