Merge "Don't hard-code number of tombstones."