Yup, it's working now. (I'm still no fan of this feature and how it's implemented, though. But that's outside of this pull request's scope.)