Some general tidying up and removing unnecessary kludges.
First pass at a Drupal 7 port. Appears to work for me. Will let it mature for a week or two before daring to call it 7.x-1.0.
This has been sitting so long without a release, but without any bugs, I can't put it off any longer.
Dev snapshot from HEAD.