all: Minor cleanup.