Removing the last dependency on Marshal