Fix #4 (use PerfUtils).
Minor code clean-up.