Revise to better match assignment instructions