This simple refactoring is a preparation for Bug 95664
Hmm. It turned out that This isn't that simple. I'll search some other way to go.