Minor refactoring; make R# happy.