Let's close this as Xaver suggested above.
I do think that unintentional wake-up prevention could still be improved, but !489 (merged) has indeed fixed a large part of it. It's clear that this MR won't be merged without some substantial changes. No changes have been made since it was initially proposed. If the overall idea comes back with a new take on the code, we can have another look at it then.