⌘-` cycles between windows of the active application, ⌘-~ cycles backwards. Learning this somewhat lessens the pain of not having a working Witch.