Some cleanups, as well as a more KOS-ish wait for frame vacancy

that is more robust than what I was doing before in the case of
error.