Fix a few owned-string usages that were inconsistent