Move macroexpand to a better place.
Remove old rubinius bug workaround