Removed def-in-defs.