Move restore-cursor out to a submodule