diff --git a/core/modules/comment/comment.install b/core/modules/comment/comment.install
index beb1085..509466d 100644
--- a/core/modules/comment/comment.install
+++ b/core/modules/comment/comment.install
@@ -208,8 +208,8 @@ function comment_schema() {
       'comment_status_pid' => array('pid', 'status'),
       'comment_num_new' => array(
         'entity_id',
-        array('entity_type', 32),
-        array('field_name', 32),
+        'entity_type',
+        'field_name',
         'status',
         'created',
         'cid',
@@ -218,8 +218,8 @@ function comment_schema() {
       'comment_uid' => array('uid'),
       'comment_entity_langcode' => array(
         'entity_id',
-        array('entity_type', 32),
-        array('field_name', 32),
+        'entity_type',
+        'field_name',
         'langcode',
       ),
       'comment_created' => array('created'),
@@ -293,7 +293,7 @@ function comment_schema() {
         'description' => 'The total number of comments on this entity.',
       ),
     ),
-    'primary key' => array('entity_id', array('entity_type', 32), array('field_name', 32)),
+    'primary key' => array('entity_id', 'entity_type', 'field_name'),
     'indexes' => array(
       'last_comment_timestamp' => array('last_comment_timestamp'),
       'comment_count' => array('comment_count'),
@@ -483,8 +483,8 @@ function comment_update_8005(&$sandbox) {
   ));
   db_add_index('comment', 'comment_num_new', array(
     'entity_id',
-    array('entity_type', 32),
-    array('field_name', 32),
+    'entity_type',
+    'field_name',
     'status',
     'created',
     'cid',
@@ -493,8 +493,8 @@ function comment_update_8005(&$sandbox) {
   // Add the comment_entity_langcode index.
   db_add_index('comment', 'comment_entity_langcode', array(
     'entity_id',
-    array('entity_type', 32),
-    array('field_name', 32),
+    'entity_type',
+    'field_name',
     'langcode',
   ));
 
@@ -535,7 +535,7 @@ function comment_update_8005(&$sandbox) {
   ));
 
   // Add indexes.
-  db_add_primary_key('comment_entity_statistics', array('entity_id', array('entity_type', 32), array('field_name',32)));
+  db_add_primary_key('comment_entity_statistics', array('entity_id', 'entity_type', 'field_name'));
   db_add_index('comment_entity_statistics', 'last_comment_timestamp', array('last_comment_timestamp'));
   db_add_index('comment_entity_statistics', 'comment_count', array('comment_count'));
   db_add_index('comment_entity_statistics', 'last_comment_uid', array('last_comment_uid'));