cleanup trust_check overloading; minor tweaks