Although it looks like cutting out the return vals.join(', '); is correct, I don't think the closing `});` is supposed to be removed, when comparing to the patch in https://drupal.org/node/1574512.