Add type and annotation constants. Fix InjectionResolver type checks.