1.0.10: Rationalize generation of the address element