Simplifies definition. Adds FIXME.