Fix expander with help from @mflatt.
Fix expander with help from @mflatt.

Not quite done yet.

vishesh/pycket,samth/pycket,vishesh/pycket,magnusmorton/pycket,magnusmorton/pycket,vishesh/pycket,pycket/pycket,samth/pycket,pycket/pycket,cderici/pycket,cderici/pycket,pycket/pycket,magnusmorton/pycket,cderici/pycket,samth/pycket