Draft: fix some oversights with vendor options

Closes #2517 (closed).

The statement with the addition to classes that does nothing is worrying. Also, less impactful, let's use uint32_t for vendor ID like in all other places. These were comments added by @djt in !1758 (merged).