Use !include-raw for update-validate macro