Merge pull request #2237 from alex/reduce-duplication

Reduce the duplication in teh string versions of oids