Remove most abuses of the meta-language in derived definitions.