Code refactoring.
Fix issue #2832787 by nexg: Subfield Weight Ordering Wrong With PHP 7.x
Code refactoring. For more detail see http://cgit.drupalcode.org/addressfield_id/diff/?h=7.x-1.1
Code is in flux and should not be depended on for consistency. Features are added and removed on a daily basis. Please DO NOT post bug reports in this state. Feature requests and suggestions are more than welcome.