This allowed me to remove the factory that is now totally replaced by
the generated factory code and the new new macros.

Change-Id: I4d1d68c1f14f1ffcd467839f81488b17431092f7