Moved autonomous programs back to independent types