Some minor cleaning up [ci skip].
Some work towards opening a remote file (#313).