Tidy up

manage_display.module

@@ -41,7 +41,7 @@ function manage_display_entity_type_build(array &$entity_types) {
     // Set user name as a label else it gets printed twice on the user page.
     $keys = $entity_types['user']->get('entity_keys');
     $keys['label'] = 'name';
-    $keys = $entity_types['user']->set('entity_keys', $keys);
+    $entity_types['user']->set('entity_keys', $keys);
   }
 }
 
@@ -161,8 +161,9 @@ function template_preprocess_submitted(&$variables) {
  * Prepares variables for 'in_reply_to' field formatter template.
  */
 function template_preprocess_in_reply_to(&$variables) {
-  // @todo Remove the forced rendering. Find out how to render within
-  // translation in the template.
+  // Force rendering.
+  // @todo Remove after fixing core bug.
+  // @see https://www.drupal.org/project/drupal/issues/2334319
   $renderer = \Drupal::service('renderer');
   $variables['subject'] = $renderer->render($variables['elements']['subject']);
   $variables['uid'] = $renderer->render($variables['elements']['uid']);