Eliminating eTree from metadata calculations.