Yet another correction to earlier commit.. *now* those rank-2 pattern matches should work MERGE TO STABLE