Add fix for getattr(obj, name, default). Rearrange a few things.