Fix comments.
Great efficiency improvement.

Instead of pattern matching, I use pi1 and pi2.