Improve consistency checking for derived instances