Updated for ren-general changes.