Vendor form refactoring work.