Some cleanup and reorganizing of netcore eval.