unwrap: PEP8 fixes.