General cleanup of component injection code...