$token->return_attr;
  # becomes
  $token->attr;

  $token->return_text;
  # becomes
  $token->text;