Some minor cleaning up [ci skip].
Some work on revisiting our handling of local/remote files (#420) [ci skip].