emergency-sulogin: trivial cleanups