Now that you're using OptAddressRange for TARGET I think this normalization can be avoided (deleted). Any reason to keep it?