Increase test coverage. Prune unused branches