You may be right.  I'll take another look at this and try to simplify it.