Sure.  Just pushed a refactoring change.  Take a look and let me know what you think.