This clean up code, and the instance should be be responsable for this conversion
  as it is all instance related parameters anyway.