add: support expansion-time evaluation forms and validate some input