Sounds good to me, if #1826 is still a ways off...