These aren't fixed by this PR, but were broken in a few older attempts at it. Make sure they don't regress.