Streamline file retrieval (possibly fixing #8).