Fix twiddle bug(s)
Fix twiddle bug(s)

Needed some freshening to replace the correct eids; also was calling the wrong recursive function for the second place where we do inlining

Also improved whitespace preservation.
ravichugh/sketch-n-sketch,ravichugh/sketch-n-sketch,ravichugh/sketch-n-sketch,ravichugh/sketch-n-sketch,ravichugh/sketch-n-sketch,ravichugh/sketch-n-sketch