Fix inconsitencies between code assumptions and schema (#34901)

* Fix inconsitencies between code assumptions and schema

* Address a couple of RETURN issues, where the description was parsed as a dict

test/sanity/validate-modules/main.py

@@ -1065,7 +1065,7 @@ class ModuleValidator(Validator):
         for option, details in options.items():
             try:
                 names = [option] + details.get('aliases', [])
-            except AttributeError:
+            except (TypeError, AttributeError):
                 # Reporting of this syntax error will be handled by schema validation.
                 continue