Source refactoring; no functional changes.