Revert "Renumber effect macros"

This reverts commit f17af281d992ecb954139a8281951c58e92559bd.