Updated the match internals.

This update was aimed at making the intent clearer and applying
some software engineering to reduce unintentional effects the next
time I try and modify the file.