Code compiles now, and existing tests succeed.