Some work towards reloading a file (#159 and #233).