Updated to compile with the new strongly-typed enums.