Some more converting to ARMRange usage. Trouble encountered with IF classes. Waiting on update from Joe, non-working commit.