Upgrade to new file-visitor