Merge pull request #1189 from TheBlueMatt/2021-11-trivial-impls