Mods to accomodate torch refactor.