Clean up defaction macro to get rid of magic apply-action