Defaults have been changed to None wherever possible.