Minor cleanup to relative mode addressing.