Small cleanups in interruption module