Remove matcher from some functions. Add more asserts.