Fix bugs in ArgumentBuilder.

RB=330531
R=mtagle,gogenc,si-dev
A=gogenc