Add level-triggering fo' realz. Extra cleanups too.