Prep for ARC conversion

Signed-off-by: Mark Kirk <mklists@gmail.com>