COMP: Fixed unneccessary allocations.