Improved performance removing null checks from injection points.