More conservative handling of tp_new for now