Minor cleanup. [ci skip]