3291 - macroexpand now working reliably

We're storing expansions in a consistent place.
3292 - minor weirdness: table lookup returns false on failure