Fixes for expliciteness and consistency.