Actually, I am just going to clean up mine, since the old one seems to work, and I don't know the history/backwards compatibility requirements.  But since there is no history for mine I can guarantee that buckets and done will never be set in the same response, so can simplify it down to two clauses.