Sure, I'd add it as a follow-up patch.