Making progress on 'AVS postal code is unused.

#438 will fix this.