Uncommenting remaining non-X functions!