Generate substatements as statements too

Preventing pushing on stack redundant Unit instances

 #KT-5667 fixed