Excellent. This can be combined with the other refactoring(s) needed.