Add some invariant checking for refinements