Use CONCAT_WS to handle possible NULL values

CONCAT returns NULL if any argument is NULL.  CONCAT_WS (with separator)
treats NULL as ''.  So with an additional argument for the separator at
the front, we just use '' as the sep, and we're good to go.