Corrections in comments. Remove unneeded default expansions in list_enabled() and list_disabled().