Minor cleanup of build script based on comments from @dougborg.