Some more work on the definitions structure.