Move variables back to core hyperfish file, to allow import of just that file