Made trivial() more aggressive