Would be great if someone ran this through http://drupal.org/project/coder and had a way to move this module towards D7.