Formatting changes to facilitate integration of "py3" patchset.