RELEASE 8.00. More trivial code cleanup.