list*/cons* changes to make diffs smaller