[Olena-patches] cleanup-2008 2734: Make shell a value.