Fixups after rebase.

I'm not sure why this test changed but the new code appears to be
equivalent to the code generated by trunk.