Make addressing modes more explicit