More trivial code cleanup.