Trying to get rid of recursive expansions. To no avail.