Header version coded. Next to factor. Then work on C and Java versions.
Factored generic types.