Fixing compile errors caused by my earlier refactoring.