Doesn't really qualify as "shoehorned" when the plot was written around it to begin with.