Stop using a config field's type to determine 'remove from env'

It doesn't work so well sometimes.
Better to be explicit, to prevent surprises.