EFOOFUS: make previous commit compile, pass tests.