Cleanup WGSol, sketch addition of vbf semi-norm impl.