Don't repeat function names in spec descriptions
Invert Match retrieval and Result persistence