Simplified address decoding a little.