More internal cleanup.