diff --git a/core/modules/field/field.api.php b/core/modules/field/field.api.php
index 095c28d..7ef76f5 100644
--- a/core/modules/field/field.api.php
+++ b/core/modules/field/field.api.php
@@ -35,11 +35,11 @@
  *   - weight: The default weight of the element.
  *   - visible: The default visibility of the element. Only for 'display'
  *     context.
- *   - edit: (optional) String containing markup (normally a link) used as the 
- *     element's 'edit' operation in the administration interface. Only for 
+ *   - edit: (optional) String containing markup (normally a link) used as the
+ *     element's 'edit' operation in the administration interface. Only for
  *     'form' context.
- *   - delete: (optional) String containing markup (normally a link) used as the 
- *     element's 'delete' operation in the administration interface. Only for 
+ *   - delete: (optional) String containing markup (normally a link) used as the
+ *     element's 'delete' operation in the administration interface. Only for
  *     'form' context.
  */
 function hook_field_extra_fields() {
@@ -1652,7 +1652,7 @@ function hook_field_storage_create_field($field) {
  */
 function hook_field_storage_delete_field($field) {
   // Mark all data associated with the field for deletion.
-  $field['deleted'] = 0;
+  $field['deleted'] = FALSE;
   $table = _field_sql_storage_tablename($field);
   $revision_table = _field_sql_storage_revision_tablename($field);
   db_update($table)
@@ -1660,7 +1660,7 @@ function hook_field_storage_delete_field($field) {
     ->execute();
 
   // Move the table to a unique name while the table contents are being deleted.
-  $field['deleted'] = 1;
+  $field['deleted'] = TRUE;
   $new_table = _field_sql_storage_tablename($field);
   $revision_new_table = _field_sql_storage_revision_tablename($field);
   db_rename_table($table, $new_table);
diff --git a/core/modules/field/field.crud.inc b/core/modules/field/field.crud.inc
index 3138b00..873ab55 100644
--- a/core/modules/field/field.crud.inc
+++ b/core/modules/field/field.crud.inc
@@ -169,8 +169,8 @@ function field_read_fields($conditions = array(), $include_additional = array())
 
   // Translate "do not include inactive instances" into actual conditions.
   if (!$include_inactive) {
-    $conditions['active'] = 1;
-    $conditions['storage.active'] = 1;
+    $conditions['active'] = TRUE;
+    $conditions['storage.active'] = TRUE;
   }
 
   // Collect matching fields.
@@ -360,8 +360,8 @@ function field_read_instances($conditions = array(), $include_additional = array
 
   // Translate "do not include inactive fields" into actual conditions.
   if (!$include_inactive) {
-    $conditions['field.active'] = 1;
-    $conditions['field.storage.active'] = 1;
+    $conditions['field.active'] = TRUE;
+    $conditions['field.storage.active'] = TRUE;
   }
 
   // Collect matching instances.
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/Field.php b/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/Field.php
index fe6886a..0180dd4 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/Field.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/Field.php
@@ -315,7 +315,7 @@ public function save() {
         throw new FieldException(format_string('Attempt to create a field of unknown type %type.', array('%type' => $this->type)));
       }
       $this->module = $field_type['module'];
-      $this->active = 1;
+      $this->active = TRUE;
 
       // Make sure all settings are present, so that a complete field
       // definition is passed to the various hooks and written to config.
@@ -332,7 +332,7 @@ public function save() {
         throw new FieldException(format_string('Attempt to create a field with unknown storage type %type.', array('%type' => $this->storage['type'])));
       }
       $this->storage['module'] = $storage_type['module'];
-      $this->storage['active'] = 1;
+      $this->storage['active'] = TRUE;
       // Provide default storage settings.
       $this->storage['settings'] += $storage_type['settings'];
 
diff --git a/core/modules/field_sql_storage/field_sql_storage.module b/core/modules/field_sql_storage/field_sql_storage.module
index e8afd3c..b4587c2 100644
--- a/core/modules/field_sql_storage/field_sql_storage.module
+++ b/core/modules/field_sql_storage/field_sql_storage.module
@@ -359,7 +359,7 @@ function field_sql_storage_field_storage_update_field($field, $prior_field, $has
  */
 function field_sql_storage_field_storage_delete_field($field) {
   // Mark all data associated with the field for deletion.
-  $field['deleted'] = 0;
+  $field['deleted'] = FALSE;
   $table = _field_sql_storage_tablename($field);
   $revision_table = _field_sql_storage_revision_tablename($field);
   db_update($table)
@@ -367,7 +367,7 @@ function field_sql_storage_field_storage_delete_field($field) {
     ->execute();
 
   // Move the table to a unique name while the table contents are being deleted.
-  $field['deleted'] = 1;
+  $field['deleted'] = TRUE;
   $new_table = _field_sql_storage_tablename($field);
   $revision_new_table = _field_sql_storage_revision_tablename($field);
   db_rename_table($table, $new_table);