I don't think this is a good move, merging these conditions. Now the `else` below will handle many more situations. Let's retain the "if it's a king" block, with the castling-check inside it as a separate condition.