Done revisiting our handling of local/remote files (closes #420).