Just thought I'd give a final update after the repairs were done.
Been driving around as much as I can do to this beautiful weather we have been having since summer was mostly a washout. Drove down to my buddy's house in Maryland, up and down the Delaware river shore line several times and have put on about 700 miles with no loss of coolant or overheating.
I'd say it is fixed as there are no signs of coolant or mayonnaise at the bottom of my engine oil cap and the oil level on the dipstick is clean and at the full mark.
1984 CJ-7 Renegade