Issue #19296 code cleanup and formating.
Issue #19296 First pass at simplifying X.database.
Issue #19296 First pass at moving ALL of node-datasource to XM.SimpleModle.