Minor coding policy fixes.