That's cleaner.  Rebased with this version.