Fix erroneous uses of get1() and get2() in many cases.