Simplify MEMMEM handling, removing an extra version added to assist in checking the
change to make result come first.