More cleaning, merged in AlwaysInterrupt branch so that it could be
deleted.