Smarter notification cancelling, #213