Yet more trivial code cleanup.