Shorter, cleaner, easier; love it.  I'll update my fork.  Thanks!