Remove some hacks added while adding test coverage.