Always combine headers using ", " rather than allowing multiple ways. Also trim trailing whitespace.