Another pass at notation update in the (n, 1, 1) case.