Seems like this change plus the feature request is a sensible path forward.