Merge "Fix typing bug in load store elimination"