Changed sequence: inline subst before tables. Make tables more robust.