There are still fairly bewildering set of callbacks being tossed around, but it's at least a little less verbose now.