Rephrase a few pattern matches, fix ANF tracing.

Addresses review comments