minor progress in saving builder state, for #1575