My proposal should generate the same code as this patch.