builder.test: more using fixes
builder.test: more using fixes

sarvex/factor-lang,mrjbq7/factor,cataska/factor,sarvex/factor-lang,tgunr/factor,jwmerrill/factor,AlexIljin/factor,erg/factor,mcandre/factor,mrjbq7/factor,mcandre/factor,sarvex/factor-lang,mcandre/factor,bpollack/factor,slavapestov/factor,tgunr/factor,bjourne/factor,erg/factor,ceninan/factor,jwmerrill/factor,bpollack/factor,ehird/factor,dch/factor,factor/factor,dharmatech/factor,AlexIljin/factor,nicolas-p/factor,bpollack/factor,bjourne/factor,AlexIljin/factor,slavapestov/factor,seckar/factor,kingcons/factor,tgunr/factor,mecon/factor,bpollack/factor,mrjbq7/factor,littledan/Factor,erg/factor,seckar/factor,AlexIljin/factor,kingcons/factor,bjourne/factor,jwmerrill/factor,nicolas-p/factor,bjourne/factor,nicolas-p/factor,mecon/factor,mrjbq7/factor,slavapestov/factor,mcandre/factor,bpollack/factor,sarvex/factor-lang,mcandre/factor,seckar/factor,ceninan/factor,slavapestov/factor,erg/factor,cataska/factor,littledan/Factor,erg/factor,ceninan/factor,sarvex/factor-lang,sarvex/factor-lang,cataska/factor,factor/factor,nicolas-p/factor,ehird/factor,factor/factor,tgunr/factor,nicolas-p/factor,sarvex/factor-lang,dch/factor,erg/factor,tgunr/factor,bjourne/factor,erg/factor,bjourne/factor,dch/factor,slavapestov/factor,mrjbq7/factor,kingcons/factor,AlexIljin/factor,mcandre/factor,Keyholder/factor,dch/factor,tgunr/factor,bjourne/factor,ehird/factor,mcandre/factor,Keyholder/factor,bpollack/factor,nicolas-p/factor,mrjbq7/factor,nicolas-p/factor,AlexIljin/factor,mecon/factor,slavapestov/factor,bpollack/factor,cataska/factor,dharmatech/factor,AlexIljin/factor,Keyholder/factor,littledan/Factor,mecon/factor,kingcons/factor,dch/factor,slavapestov/factor,littledan/Factor,dch/factor,factor/factor,mecon/factor,dharmatech/factor,ceninan/factor,mecon/factor,factor/factor,mecon/factor,factor/factor