Don't use addx/addy where unnecessary

This was old code.