Select or other support

The module doesn't show a label for the FAPI elements of type select_or_other.

The following quick hack worked, but I'm not sure if this is the right solution for all select_or_other element types.

/**
 * Helps find the title of the field, as it could be in several places.
 */
function _field_collection_table_get_title($field) {
  $title = '';
  $required = FALSE;

  if (isset($field['#language']) && isset($field[$field['#language']])) {
    $language = $field['#language'];
// ---------------------------------------------------------------
    if (isset($field[$language]['#type']) && $field[$language]['#type'] == 'select_or_other') {
      $title = $field[$language]['select']['#title'];
      $required = !empty($field[$language]['select']['#required']);
    }
// ---------------------------------------------------------------
    elseif (isset($field[$language]['#title'])) {