In my mind, this should be taken care of as part of #427. At least this is what I foresee to do.