Extract actions into top-level defuns
Remove `delayed' attribute