clean up continuation argument handling in core