Update for ToPyType/FromPyType split