Updated all old-style inheritance calls.
Missed two spots for use of ``super(…)``.
Merge branch 'switch-to-super' into develop
Fixes #1918, #1936 & #1937.