Changing some more metaphors in the code.