auto_build: Minor cleanup