[Olena-patches] cleanup-2008 2157: Make the 'plain' and 'safe' morphers work.