Thanks; looks fine.
I created a PR on afw because I don't think there was one.
There's a minor nitpick on the on the astshim PR. In addition, I wonder about this comment:
Each new CmpMap is simplified using `simplify` before being stored in the FrameSet.
Without digging around in astAddFrame more than I want to, it's not obvious whether that should now be “using `simplified`”, or if this is referring to some function in AST itself (but that seems to be ast_simplify, not just simplify). (To be honest, after a couple of minutes of poking about, I couldn't find where this simplification is happening at all, so I gave up...)
I'd like to see a ticket for removal of the deprecated functions after some future release.
Other than that, good to go.