[Olena-patches] 610: Tiny fix + resume separating decl and def.