Refactor storage class generation.

Closes #3452414

Merge request reports

Loading