I agree about the Black Waltz fights, if only for Steiner's exasperation about fighting them after you defeat the third one on the ship.