swift234

some more minor tidying up: use StringRef instead of std::string in
one place, and use types already available instead of reconstructing
them (to simplify code).



Swift SVN r9583