* Fix reordering of build steps in the clean list of steps.
 * Make the code more robust and avoid removing and inserting
   the item.
 * Update code for the build steps list too for reasons of symetry.

Reviewed-by: dt