Minor refactoring (for code consistency).
No functional changes.
3 files changed