Improve usage of file parsing utilities

Closes #1000