Clean up frozen checks + improve coverage.