MP: Simplify trace method