Fix encoding of R+R and R+IN3, prevent fractional addresses, both related to #18