Improve multi-password replacement behavior

[sfraint]

Fixed multiple-password-replacement behavior where passwords would be incorrectly left alone if a preceding password were a reserved word.

Fixes #74

---

This change is 

[dhalperi]

Reviewed 2 of 2 files at r1. Review status: all files reviewed at latest revision, all discussions resolved.

---

Comments from Reviewable

[dhalperi]

---

Review status: all files reviewed at latest revision, all discussions resolved, all commit checks successful.

---

Comments from Reviewable