Propose some variables for the patterns...

... and some more changes.