Updated the GS classes to use new-style classes as well.
Merge branch 'gs-new-style-classes' into develop
Fixes #1927.