Fix welder charge use during vehicle construction

Closes #1016. Closes #1058.