Performance improvements. Removed null check in property injection points.