[XXE] RFE: More nuanced validation of