Porting to new devel with smart pointers.