Make more use of HWI_COMPUTABLE_MODE_P