Fix invalid reuse of the type of the previous Given block