Move a TODO to issue #14.