Some pep8.
Remove comment about keeping old-form tail messages.