CBLT-179:  don't fail after diff statements after instantiating tokens

Change-Id: I57b78e95988c49e76e01527bb657b22e3678c9d4
Reviewed-on: http://review.couchbase.org/36540
Reviewed-by: Philip Labee <philip@couchbase.com>
Tested-by: Philip Labee <philip@couchbase.com>