Trying to find source of and fix some unsoundness issues.