Major reworking to how callback-invocation pattern matching works.  Doesn't appear to operate correctly quite yet, since the tests fail on the first allocation...