Remove "expand" function.

For my reasoning, see issue #110.