The mod-cluster subsystem has many of the same issues we saw in the web subsystem. For my work on AS7-3933 I'm going to make a start on converting it to ResourceDefinition, but for 7.1.1 there won't be time to do more than what's needed for fixing the expression support issue covered by that JIRA. This JIRA is for a larger overhaul.