Fix #32: handle upstream change in query-replace-read-args