Get rid of old XXX.

Fixes #9.