Follow-up: style fixes