Merge "Simplify toStringArray implementation"