Update to new syntax and remove chained imports.