Ping - I think this block is the last issue: The gencode remote part still always emit code, if even not necessary. If you check if it is really necessary and only output code in that case we can merge the type - one last step to go!