We've already heavily modified both of these modules, and "made them our own" (and they're in kalite, not in python-packages, so they're now part of the project code, rather than being libraries), so I think we should convert them to our conventions as we go.