HOPKINS: Remove several GOTOs in PARCOURS2