Merge "Handle long process names correctly."