Validate minor cleanup

Ran into this as I was adding structs. Tried remove `Validate` from `extract` but ran into problems with `PrintFactsSpec` and decided to take the easy way out for now.

/cc @markhibberd