More work on definition type inference