Remaining things converted to dcl/delite