Remove direct dependence on pc, which can mess things up.