Small fixes to clarify consistency issues.