Bonus points if you test for idempotency while you're back in the code anyway...