Cleanups on definitions.