Lol, definitely crossed my mind when I was ordering B21's a couple weeks ago for C-board repairs. It would be ideal, actually. Added to my never ending project listGiven it's possible to buy NOS CPS-B-21 chips, have you thought of including it in your design. This way you could have one unique design with keyed connectors that fits all configurations.

-ud