Updated all old-style inheritance calls.

Should resolve both #1918, #1936 & #1937. Unit tests pass, working on running the integration suites now.

Review please? @danielgtaylor