Remove some references to Python 2

Also simplify the dict_to_avdict signature as we:

• always pass clear=True
• always explicitly pass the encoding and errors arguments