Replacing `<intro-address-model>` and `<intro-instruction-set>` with `<address-model>` and `<instruction-set>` respectively