I have a pending change that simplifies along those lines: https://rbcommons.com/s/twitter/r/3463/