Revert "Defer definition of common sets with AtBeginDocument"

This reverts commit 2a775e0fa59fb13cb6cae3d2bbd573e96dc2cee8.