ENG-6260 Simplify plannode memory management, fix OSX10 eecheck.