Get variable reordering working for Declarations.