Finally clean up enough errors to start failing tests.