Readability improved slightly.
Scope of variables on LHS of rules is now the full LHS. Order of matches is preserved during building.