Ok, so lets leave it then. We might want to tackle it when working on the restartless version, which would require a rewrite in any way.