Tried to be too 'smart' with our tree item delegates...