In continuation of #19624 this catches some unlifted entries. Hope there is no more left, for consistency it now covers comments and perhaps non-active (hotpath) parts.
Balint Cristian