The important thing is that we don't have a behavior regression, so testing this would be key. That being said I would rather have the code paths cleaned up so that things are consistent, and if we need to have separate behaviors then it would be good to know sooner rather than later. Would you be comfortable unifying this behavior?