Revise DFXML declarations