Fix instruction addressing, remove old non-indirect load/stores