Sorry, whitespace is all messed up. I use vim, mostly for Perl or PostgreSQL.
Perl is best with 4 spaces substituted for a tab. I will see about fixing vim screwing things up and I should also read style before messing around with that part of files. Anyway, I will submit new diff's if all is OK. Chris