According to Paul's private remarks I made this last patch. I would greatly
appreciate it if anyone could take the time to review these changes.