Some small refactoring to reduce some of the differences between i965 NIR linking and Gallium NIR linking.