Make calculator not dependent of ecore_x.