Fix Jim's style violations.