Only excluded actually expanded fields from render

Previously we excluded all mapped kwargs from being rendered, which cause issues for fields that are not actually rendered during expansion (i.e. those that are literals). This new implementation adds some extra logic to ensure we still include kwargs that still need rendering.

Fix #25588.

Seems to make sense.