XXX bugfixes for opt_to_ssa
XXX more fixes