Comment and style fixes; fix copyright header in deprecated.py.