Consistency in code layout of `address`