API: Refactor continuation code and add to purge, watch, etc.