Improved DeclarationOrder modifications