Whitespace cleanup
[BUGFIX] Avoid persisting already persisted file references