[step] Remove config indirection.

recipe_engine/run.py

Index: recipe_engine/run.py
diff --git a/recipe_engine/run.py b/recipe_engine/run.py
index 074c90a8c36b10544492730ef1adb9cc7d2f0173..96e4253604c9377203b7f154e46f36fc3b924757 100644
--- a/recipe_engine/run.py
+++ b/recipe_engine/run.py
@@ -250,7 +250,8 @@ class RecipeEngine(object):
     Runs a step.
 
     Args:
-      step_config (recipe_api.StepConfig): The step configuration to run.
+      step_config (recipe_api.StepClient.StepConfig): The step configuration to
+        run.
 
     Returns:
       A StepData object containing the result of running the step.
@@ -274,20 +275,20 @@ class RecipeEngine(object):
       if step_result.retcode in step_config.ok_ret:
         step_result.presentation.status = 'SUCCESS'
         return step_result
+
+      if not step_config.infra_step:
+        state = 'FAILURE'
+        exc = recipe_api.StepFailure
       else:
-        if not step_config.infra_step:
-          state = 'FAILURE'
-          exc = recipe_api.StepFailure
-        else:
-          state = 'EXCEPTION'
-          exc = recipe_api.InfraFailure
+        state = 'EXCEPTION'
+        exc = recipe_api.InfraFailure
 
-        step_result.presentation.status = state
+      step_result.presentation.status = state
 
-        self._step_stack[-1].open_step.stream.write_line(
-            'step returned non-zero exit code: %d' % step_result.retcode)
+      self._step_stack[-1].open_step.stream.write_line(
+          'step returned non-zero exit code: %d' % step_result.retcode)
 
-        raise exc(step_config.name, step_result)
+      raise exc(step_config.name, step_result)
 
   def run(self, recipe_script, api, properties):
     """Run a recipe represented by a recipe_script object.