Minor changes to HPX_PREFIX logic