Performance boost when loading flatfile. Fixes #133.