WSI Validation: Move some things between .h and .cpp files.

This will more-closely mirror what's being done in the generic layer, which was
the original source of this layer.
2 files changed