Some, but not all, style issues fixed.