Small update for shifted load/stores. Still disabled.