I actually think Ianto did march to his death - he seemed to be getting a strange fixation with death lately, asking Jack about what it feels like to die, brooding about it in the radio plays and the msot recent (which may not be essentially canon, although the radio plays are meant to be, i think).....I truly think he walked into that building fully aware he would be leaving in a body bag.