Python packing cleanup

Refs #1429.