Add invariant reducing function. Not clear yet what impact this has.

Also not clear if this is the best way to include it.  Probably need the std::variant approach here too.