Unprefixed definitions in the right place.

See title.