Bugfix to work with the two-addr changes that have been made in the tree recently