Support no default and make the gateway/shipping tables more streamlined. Closes #3472