Fix up floating and breakpoint variablizing