[FOLLOWUP] Convert remaining occurences of makeInstance