New methods for handling expansions
Still trying to make makeres-macro work with tabletrans
fixes