Safety dance

Changed to be more safe, and changed to "contents-modified" vs
"changed" since the latter interrupts keyboard events!