Improved coverage to 97-98% while preserving API.