ENG-4671: Clean up code and add null costing for NLJ (vs NLIJ).