Superknob soft-takeover issues -- Address notes and add test.