These all need to use the new docstring style also.