auto_build: Minor tune-up