Fix some lingering weirdness with addressing modes