This series of patches fixes PR106594, an aarch64 regression in which we fail to combine an extension into an address. The first patch just refactors code. The second patch contains the actual fix.
The cover note for the second patch describes the problem and the fix. Tested on aarch64-linux-gnu and x86_64-linux-gnu. OK to install? Richard
