Minor cleanup (to be squashed).