BUG-579: removed dependency on GeneratedTOBuilderImpl from Types to break a package...