Fix compile error after Phil's recent refactoring