Additional formal fixes.