I have another commit doing that, I'll make that part of this pull.