Move everything that isn't LaTeX3 to LaTeX3