Fix up parent merge.
Format with autopep8.