Further fixes to get adt_calc code generated correctly