~Another~ performance boost on encode / doc updates