Use null column for association key types

Refactoring of #15482 with new behavior available only on master.