For ENG-5865, fix several more memory lifecycle issues, life without destructors is pain