Fair enough, I wasn't sure if reordering the enum would impact something outside of the scope of this patch, but since it doesn't that makes it easy. I'll submit a new version