Fixed in my repo.  Much cleaner, thanks