[Olena-patches] 2702: Use more routines provided by Olena.