Move non-idempotent components out of default recipe