Move the minor arm-specific logic to a dedicated variable so we can merge its configure logic up a level.
Mike Frysinger