diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 72ad5794a7d47044f8473922e910ffada6454ae3..451adb3192dfb5def67e3335cef7be6db86c7040 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@
 CCK 6.2-dev
 ===========
 
+- #312546 by stella, code cleanup.
 - #311146 by Brian294, dheffron, yched, and others, fix critical javascript problem in new Manage fields UI screen in some themes.
 - #317032 by hass, code cleanup.
 
diff --git a/includes/content.admin.inc b/includes/content.admin.inc
index 4cdd64791dc3cd9b661a73b820e0019435874e93..ce9511776f37edc3a78b3c42d0e5a208d742776a 100644
--- a/includes/content.admin.inc
+++ b/includes/content.admin.inc
@@ -1049,7 +1049,7 @@ function content_field_edit_form(&$form_state, $type_name, $field_name) {
         '#tree' => TRUE,
         '#description' => t('Advanced usage only: PHP code that returns a default value. Should not include &lt;?php ?&gt; delimiters. If this field is filled out, the value returned by this code will override any value specified above. Expected format: <pre>!sample</pre>To figure out the expected format, you can use the <em>devel load</em> tab provided by <a href="@link_devel">devel module</a> on a %type content page.', array(
           '!sample' => $sample,
-          '@link_devel' => url('http://www.drupal.org/project/devel'),
+          '@link_devel' => 'http://www.drupal.org/project/devel',
           '%type' => $type_name)),
       );
     }
diff --git a/tests/content.crud.test b/tests/content.crud.test
index 93532bf07881127e030392f6ddfd635919c6671d..9b2cac227a7827ad41ec6f444f9fdd396029e111 100644
--- a/tests/content.crud.test
+++ b/tests/content.crud.test
@@ -379,7 +379,7 @@ class ContentCrudBasicTest extends ContentCrudTestCase {
   function getInfo() {
     return array(
       'name' => t('CRUD - Basic API tests'),
-      'description' => t('Tests the field CRUD (create, read, update, delete) API. <b>Requires <a href="@schema_link">Schema module</a>.</b>', array('@schema_link' => url('http://www.drupal.org/projects/schema'))),
+      'description' => t('Tests the field CRUD (create, read, update, delete) API. <strong>Requires <a href="@schema_link">Schema module</a>.</strong>', array('@schema_link' => 'http://www.drupal.org/projects/schema')),
       'group' => t('CCK'),
     );
   }
@@ -435,7 +435,7 @@ class ContentCrudSingleToMultipleTest extends ContentCrudTestCase {
   function getInfo() {
     return array(
       'name' => t('CRUD - Single to multiple'),
-      'description' => t('Tests the field CRUD (create, read, update, delete) API by creating a single value field and changing it to a multivalue field, sharing it between several content types. <b>Requires <a href="@schema_link">Schema module</a>.</b>', array('@schema_link' => url('http://www.drupal.org/projects/schema'))),
+      'description' => t('Tests the field CRUD (create, read, update, delete) API by creating a single value field and changing it to a multivalue field, sharing it between several content types. <strong>Requires <a href="@schema_link">Schema module</a>.</strong>', array('@schema_link' => 'http://www.drupal.org/projects/schema')),
       'group' => t('CCK'),
     );
   }
@@ -510,7 +510,7 @@ class ContentCrudMultipleToSingleTest extends ContentCrudTestCase {
   function getInfo() {
     return array(
       'name' => t('CRUD - Multiple to single'),
-      'description' => t('Tests the field CRUD (create, read, update, delete) API by creating a multivalue field and changing it to a single value field, sharing it between several content types. <b>Requires <a href="@schema_link">Schema module</a>.</b>', array('@schema_link' => url('http://www.drupal.org/projects/schema'))),
+      'description' => t('Tests the field CRUD (create, read, update, delete) API by creating a multivalue field and changing it to a single value field, sharing it between several content types. <strong>Requires <a href="@schema_link">Schema module</a>.</strong>', array('@schema_link' => 'http://www.drupal.org/projects/schema')),
       'group' => t('CCK'),
     );
   }
@@ -644,7 +644,7 @@ class ContentUICrud extends ContentCrudTestCase {
   function getInfo() {
     return array(
       'name' => t('Admin UI'),
-      'description' => t('Tests the CRUD (create, read, update, delete) operations for content fields via the UI. <b>Requires <a href="@schema_link">Schema module</a>.</b>', array('@schema_link' => url('http://www.drupal.org/projects/schema'))),
+      'description' => t('Tests the CRUD (create, read, update, delete) operations for content fields via the UI. <strong>Requires <a href="@schema_link">Schema module</a>.</strong>', array('@schema_link' => 'http://www.drupal.org/projects/schema')),
       'group' => t('CCK'),
     );
   }