Sounds good to me. Are you volunteering to do that separate commit, or should I file an issue so that it doesn't get forgotten?