More miscellaneous string cleanup.