Fix for recent rustc changes: can't mutate in match guards.

Otherwise a minor change.