A better AUTOSAR ARXML folding