Refactoring configuration processing / altering / getting functions for the new addressfield.json format.

Will almost certainly cause tests to fail.