Got rid of buffer signature in matcher methods.