Revert "Renumber effect macros"

This reverts commit 9f896e1c198f43712192690c74552c4f0305d366.